Skip to content

[7.17] Ensure elasticsearch logs and data dirs exist before startup (backport #17531) #17538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 9, 2025

Release notes

[rn:skip]

What does this PR do?

With a recent change in ES elastic/elasticsearch#125449
configuring path.data or path.logs to directories that do not exist cause ES to
not be able to start up. This commit ensures those directories exist. The
teardown script already ensures they are removed

rm -rf /tmp/ls_integration/es-data
rm -rf /tmp/ls_integration/es-logs

Why is it important/What is the impact to the user?

N/A

Checklist

  • My code follows the style guidelines of this project
  • [ ] I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files (and/or docker env variables)
  • [ ] I have added tests that prove my fix is effective or that my feature works

Related issues


This is an automatic backport of pull request #17531 done by [Mergify](https://mergify.com).

Copy link
Author

mergify bot commented Apr 9, 2025

Cherry-pick of 8e6e183 has failed:

On branch mergify/bp/7.17/pr-17531
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit 8e6e183ad.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   qa/integration/services/elasticsearch_setup.sh

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

With a recent change in ES elastic/elasticsearch#125449
configuring path.data or path.logs to directories that do not exist cause ES to
not be able to start up. This commit ensures those directories exist. The
teardown script already ensures they are removed https://github.com/elastic/logstash/blob/712b37e1df333e8d156cb5d26fbc24aafcbfd2cd/qa/integration/services/elasticsearch_teardown.sh#L26-L27

(cherry picked from commit 8e6e183)
@donoghuc donoghuc force-pushed the mergify/bp/7.17/pr-17531 branch from 77f9caa to 778c28b Compare April 9, 2025 23:05
@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

History

cc @donoghuc

Copy link
Member

@donoghuc donoghuc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cleaned up merge conflict was trivial.

@donoghuc donoghuc merged commit 4dd7c05 into 7.17 Apr 10, 2025
4 checks passed
@donoghuc donoghuc deleted the mergify/bp/7.17/pr-17531 branch April 10, 2025 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants